Merge tag 'upstream/2016.11' into debian/master
authorSimon McVittie <smcv@debian.org>
Fri, 7 Oct 2016 20:52:26 +0000 (21:52 +0100)
committerSimon McVittie <smcv@debian.org>
Fri, 7 Oct 2016 20:52:26 +0000 (21:52 +0100)
commita72b28bd32af51fd63556bf47c9ed3da667a361c
treed3924afc655189fc054dfd6088f28dbdeab68eb3
parentb4aa279db3460c79d2152154ea910fc5855c3747
parentf04805f6465f02ea2a63b2f8ee7367901f9b7068
Merge tag 'upstream/2016.11' into debian/master

Upstream version 2016.11